(cherry picked from commit 19cb44d6796a931da5b7226c03e00b9904a00503)

This push has all the other changes from WL#9273 too, to make this work.