Merge `release/4.6.1` into `release/4.7`

cc @aerych