fixes #2622
cleanup
Merge pull request #2623 from gurbuzali/object-memory-format-fix/3.3

Object memory format fix/3.3