Fix for sizeof handling.
Merge branch 'dev' into cdg