Bridging PR to merge forgotten-password to master

This is because forgotten-password is a branch off formtools.-recordActions.