Merge "Remove InjectionInflationController from NPV"