Merge branch 'pb/config'