Revert "v5.2"

This reverts commit 08985048393c0b6bb359812e0f317f5a9ddf4748.
Revert "Revert "v5.2""

This reverts commit 92be872ba6425062f75f7e6133934823836bc48c.