login test
Merge remote-tracking branch 'origin/staging' into templating