Why these changes are here? Looks like it imported changes from master?