Merge branch 'JAL-1139_proguard' into Release_2_8_Branch