Merge "Pnf pojo improvements"