Cherrypicked nodes f0a3 and 1b36 into v1.60