Integrated part of the form with the server API
Merge remote-tracking branch 'origin/master'