Add support for 'key' and 'namespace' attributes
Merge branch 'key'