Merge "Free up memory in the ZigZagClassifierTest." into qt-dev