Merge pull request #7621 from neheb/btr