Merge "Allocate and de-allocate objects upon multi_config_change."