Merge "Replace hard-coded configuration with resource configuration" into main