Check if attribute exists with namespace, name and locale instead of name and locale only.
Merge with master