v1.21 return support