Merge branch 'FREESIDE_3_BRANCH_34237' into FREESIDE_3_BRANCH