046.10 align with feature-410.06-base - config files