Merge "Add support for debug-overrides configuration"