Merge "Fix object logging"