Merge "Add a test printHistory function" into feature/zuulv3