forward-port the 0.2.4.21 release notes