Debug message associated with TODO for JAL-1136 - re-enable dynamic recalculation...