Test commit on TestStuff/master @bug W-1701384@