[SDNC-5] Boron port and bug fixes