Merge branch 'Release_2_8_2_Branch' into merge_r282_dev