[#69] Port duration computation fix from 'develop' branch