I would say that this is a part of KIJI-419 and KIJI-299. Since KIJI-419 is already on someone's sprint, I'm not going to make any large changes that involve KijiConfiguration.