Merge branch 'pb/config' into next