Merge "Avoid using outdated $casToken field for BagOStuff calls"