Merge #15217 with fixes

Let the tests run