fix to namespace cut in config
Merge branch '1.6'