[update] regression fix backported from 1.8.12