This PR fixes an issue during gateway mode where underlying policies were not translated into meaningful policies.