Merge pull request #3823 from mono/fix-btls-managed