3.0 - Fix doc blocks in RepositoryInterface and Marshaller