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