Sync to r32402 - continued cleanup from BTL move