Bug-fix:

 - Force calculation of demand-driven data for multi-threaded cases