Issue #2313487: fix failed test from last commit