Backport #4624 and #4644 to RJSF v5#4654

nickgros merged 4 commits intorjsf-team:v5rjsf-team/react-jsonschema-form:v5from

nickgros:v5-backport-fixesnickgros/react-jsonschema-form:v5-backport-fixesCopy head branch name to clipboard