GSP fix for #847
XMerge branch '4.2-maint' into newdev