WINDUP-439: Fix for new (related) unit test failure