updated diff after merging to upstream@4.1.1