KCINFR-979: autowire generators

Comment still necessary here?