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