Merge "Refactor query delay calculations" into main