TH-03 | Client-side validation
Merge remote-tracking branch 'origin/TH-03' into dev1.0