Merge tag 'v3.2.42' into v3.2-rt

This is the 3.2.42 stable release