Merge pull request #20533 from totten/master-api4-omnivent