[105140] Fix a data bug triggered in testing
Merge branch 'bz105536-C' into release-v3.4.2