sync with lava developments