commit merge from Formbuilder 4.0.4