Merge tag 'v3.6' into fixes