Merge branch 'config-ui' into c-implementation