Merge branch 'update/instance-gen-template' into 'develop'