@amb26, @cindyli is upgrading infusion in her work for FLOE-171, which has merged this branch in already. Is it okay if we modify this in her branch instead?