some retirement work

Andrey Mokeevrequested to merge
2023.1/maa/retirement-update into 2023.1/features/maa/retirement-improvements

Merge request reports