Update to #1040: support targetid
Implement #1141 "Property to include custom content added to the fr-form-model"