Merge "BUG-994: Create QNameModule for resource sharing"