Merge "Remove unnecessary config value" into main