synchronized to ejdb v1.1.25