Merge tag 'v4.1' into p/abusse/merge_upgrade