21_config_changes

7535.patch
