Fixed merge conflict from 0848546