PGL 14.30 fix1
PGL 14.30 fix2
Revert "PGL 14.30 fix1"

This reverts commit fed3b87029f7c467d65cb7067e22392f03990698.
Merge branch 'PGL1_14.30'
Merge branch 'master' into RELEASE_14.40