Merge branch 'cabinet_req_2023_05_04' of http://git.ds-bay.com/project/ich-android into cabinet_req_2023_05_04