Merge "Add namespace tags client and tests"