046.12 align with feature-410.06-base - added tests (stubbed out)