Merge "Re-enable test_timer" into feature/zuulv3