Resolve test failures on v5.16.x
Release enjineering for 0.62