Merge pull request #6926 from leoetlino/hardcoded-numbers IOSC: Remove some hardcoded offsets and magic numbers