Merge "Pass in external packageName" into qt-dev