[TASK] Router generation fix for pre4