Added concurrency support to form editor.
Merge remote-tracking branch 'origin/6.0.x' into 6.0.x