Merge with latest gxp changes