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