Cherry pick on the release branch
# kotlintest-devs
s
Cherry pick on the release branch