Dev Fixed more issues with template permissions
Merge remote-tracking branch 'origin/2.05' into 2.05