fix for ZEN-12579 - interpolation now works, code refactored to eliminate discrepancy between internal and external timestamps