#Issue 11424: merged fix from 2.6.