Merge "Fix test failures caused by refactor in commit 7ddca84"