Merge "Fix NetworkStackTests." into qt-dev