sync with main repo
restore pared-back libs