fix: sync with changes from main of common-lib#39