Merge tag 'v4.9.21' into backport/v4.9.21/snapshot

This is the 4.9.21 stable release