Fix test failures on develop
Merge pull request #15840 from rallytime/fix_develop_tests

Fix test failures on develop