Draft: Resolve "Add fixes to TR for AAE"

Vasyl Skab requested to merge 296-add-fixes-to-tr-for-aae into master

Closes #296

Merge request reports