Merge "configs: bengal bring up changes"