Bug 1083541 - [Costcontrol] Part 2