Merge "Fix serializers for OOF callback"