Merge branch 'aj/Feature_ATS255696_NrelOteCommon' into sprint82