Save some parameters from form
Merge remote-tracking branch 'upstream/master'