Merge "Fix rollover and pass 1 time estimate" into experimental