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