Fix auto-populating templates with user and userOpt
Merge remote-tracking branch 'origin/master'