Cherry pick from 4.0 branch for TCK #1873

Closed arjantijms closed 11 months ago