Add validation of user input on client.
Merge remote-tracking branch 'main/master'