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