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