Merge branch 'JAL-1139_proguard' into develop