Fix #11493

@basepi, please cherrypick