Case 3617 - Fixed bug in restoring form values.
Merge branch 'case-3617' into develop

* case-3617:
  Case 3617 - Fixed bug in restoring form values.