Merge branch 'aliased_methods_in_serialization'