Merge i2 aldb support