Merging `release/4.4` to `develop`

Round 2...