Merge commit 'origin/template' into ldap