case 2056 - Hide form right after it was created.
Merge branch 'case-2056' into develop