Merge tag 'v3.4.21' into v3.4-rt

This is the 3.4.21 stable release