chore(release): merge up from 1.8