Kernel / RouterBuilder changes for new template resolver