Fixed post-merge test failure
Cherry picked test fix from master