Fix forward port 72 x

This will include the following pull requests from 71X into 72X:

- #4350 
- #4397 
- #4258 
- #4092 
- #4101 
- #4353 
- #4389 
- #4400 
- #4363
- #4402 
- #4451
- #4434
- #4433
- #4466

The following one will be ignored:

- #4369