Missed in merge from 'upstream/release/4.3.x'