Merge fix from 1.4.1
Configuration & Form Builder
Field UI & Builder