Sync module with d.o, add the Entity API integration patch.