Merge Upstream (reverted from commit 1eebdea151909b2ba300bc3ee6a38a84af43b599)