Merge "Handle the hardcoded configuration values"