merge GWP code (PAHMA-1083)