Update primitive patch templating and storage

Merged Mark OLESEN requested to merge style-primitive-patch into develop

Merge request reports