Merge branch 'fix_1996_masking_tcx' into 'main'

[non-BE][split-non-be][allow-regression] Fix for 1996 in TCX core

See merge request !2230