Merge pull request #19533 from totten/master-api4-status-code