Merge tag '1.17.3' into mob