BTM

Changes to make BTM friendlier for non-production environments