👽️ lib._twodim_base_impl sync with upstream
#803
Merged
lib._twodim_base_impl sync with upstream
#803