Merge changes from topic 'password-plugin-errors'