BZ988817 - making form rendering context serializable
Merge remote-tracking branch 'origin/master'