Namespace updated.
Merged from master