Dev Fixing template permissions - work in progress
Merge remote-tracking branch 'origin/2.05' into 2.05