Merge branch 'Release_2_8_2_Branch' into mrg_dev_282