Merge branch 'main' into fix/2034-field-level-validation-on-submit