Measure creation important template forgotten whoops
Merge remote-tracking branch 'canon/develop' into develop