Merge "Add more WTFs to investigate TIME_TICK issue"