Merge "Deprecate unused config and make them no-op" into main