Merge branch 'ta/config-set-1' into jch