Putting a bow on [TORQUE-1101]