Merge "PNF support changes in policy/models"