VONE-36028, VONE-36027
Merge the fix from 1.1.0 to 1.2.....