Fix time cost computation

Change-Id: Ie3472b8d4ea6f0aa05a4e1c8bfb471f4297fce15
Merge topic 'catalyst-web' into next

2c35ad22 Fix time cost computation