Fixed conflict in merge #3877d7864c