Merge tag 'v3.4.40'

This is the 3.4.40 stable release