Merge "Fixes in ConfigProcessors"