Merging changes from trunk to 5.21.1 branch.
SWAT-130 JAFFA-260 CR-JAFFA-45
Authored by: ndzwill 2015-03-06
Parent: [r8100]
Child: [r8102]