Merge "BUG-1792: share QNames in both cases"