Merge "Merge "Use new API to build NetworkTemplate" into qt-dev am: 8ed50556f5 am: c94b3c4624 am: 900b44ccff"