Small fixes to AAE TR

Vasyl Skab requested to merge vasyl/small-fixes-tr-AAE into master

Merge request reports