merge typos from v5 repo