MOSYNCLIB-78: ADB changes