Merge tag 'v3.16' into p/abusse/merge_upgrade