Merge proposals dependent on lp://staging/~therp-nl/therp-backports/web-6.1-lp1013636-one2many_fields_honour_requiredness

1. web-6.1-lp1013636-one2many_fields_honour_requiredness
2. Dependent merge proposals