Fix merge conflict with bug 914031