Add fixes for AAE structure

Vasyl Skab requested to merge vasyl/add-fixes-for-AAE into epic/AAE
Edited by Viacheslav Sukhovieiev

Merge request reports