[non-BE][split-non-be][allow-regression] Fix for 1996 in TCX core See merge request !2230
mentioned in issue #2020