Merge "Use new API to build NetworkTemplate" into qt-dev