Add disco feature for forms layout
6.5.1