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

This reverts commit 20cc3221c36196945c6074076bf8dfe8bb320934.
Merge branch 'PGL1_14.30'