Merge branch 'cr/103120/118-object' into cr/104144/010-object