Merge branch 'BS-7035' into MasterBugFixing