Allow abcd# for passwords as well
Merge branch 'release/2.11' into release/12.0