Merge "Handle the hardcoded configuration values" into release/2019.2.0