backport #14388