Changes for v1.20.