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