046.13 align with feature-410.06-base - straggler files