Revert "Revert "5.0.2""

This reverts commit bd98f4c0b51bbc3e56f7354efc7dbcc48f2892b8.