Add disco feature for forms layout
6.5.1
Merge branch 'master' into v7.0