Add the form set mapping, fix #2787
Merge pull request #2792 from filosganga/feature/2787-add-set-form-mapping

Add the form set mapping, fix #2787