Merge conflict fix-up from last commit