Backport 8227
Backport of changes from hotfix-8227 branch, compatible with TSD section size handling.
Backport changes from the merge request
Backport of changes from hotfix-8227 branch, compatible with TSD section size handling.
Backport changes from the merge request