Cherry picked config error fix from other branch.