Merge branch 'rs/apply-validate-input' into maint