Manually merging changes from JAFFA_5_21_1_RELEASE branch
Authored by: tutasrinivas 2015-06-18
Parent: [r8283]
Child: [r8285]