[GIT PULL] namespaces fixes for 3.14-rcX