Move unlock templates
Merge remote-tracking branch 'origin/remove-bootstrap' into remove-bootstrap