backport typos + stable 30note