Merge branch '435-merge-bug-in-ism-encoder-tcxonly-and-null-diff-radius' into 'main'

Resolve #435 Merge bug in ISM encoder: tcxonly and NULL not encoded as intended [Non-BE]

See merge request !611