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