Prevent objects from being interpreted as metadata
Merged Object logging fix
Merge branch 'fredrikhesse-object-logging' into develop