Added overridden changes for bug 1330979 by R1.06 changes