Merge "Improve code quality in Appconfig"