Manually merge from JAFFA_5_7_RELEASE
Authored by: b_calderwood 2014-05-06
Parent: [r7760]
Child: [r7762]