commit template import 2
Merge remote-tracking branch 'origin/login_form' into login_form