Merge branch 'cherry-pick-42d821cf' into 'releases/2.5'

Merge branch 'bugfix/64bit-big-endian' into 'master'

Fix several bugs on 64-bit big endian architectures

See merge request !40

See merge request !41