Added overridden changes for bug 1330979 by R1.06 changes
Merge pull request #224 from sbavanasi/Bug-1330979-Correction

Added overridden changes for bug 1330979 by R1.06 changes