Merge "BUG-1382: do not instantiate prefixed QNames"