Merge tag 'v3.0.47' into v3.0-rt

This is the 3.0.47 stable release