Mirror api-jdo changes