Reverted password loop changes due to terminate and restart not being suppressed
Merge remote-tracking branch 'origin/master' into rr-2