Merged DBLP changes