fix(libraries): backport of merge 00937be7