backport #14260