CON-21: Preparing Form Builder & Marketing Toolbox to use it