MPS-19367 Generator Macro Intentions wrong: incorrect context type