[OEM-272] additional tweak to the way we infer GPs from pas.
Merge branch 'jira/OEM-272'