Upstream 3.0.46~50
Revert "Upstream 3.0.46~50"

This reverts commit ac71cf0d8b4cfbeb6e9dd215d73f74aec4a80bdb.
Revert "Revert "Upstream 3.0.41~45""

This reverts commit 038d62ef2bed8f67fc71c565cb63d08bd8c011f2.