Merge branch 'fix-userpass-interactive' into develop