Merge "Fix how tier_handler is imported"