Merge branch 'fix/odd-passwords' into 'develop'