Merge pull request #4385 from mono/work-btls-02152017