Fixed merge problems on master #4197