046.11 align with feature-410.06-base - controller.c(pp)