v9.21 release - see release notes for changes