Merge "Bug fixes to OOFPCIPOC templates, DG's, properties"