#Issue 11424: merged fix from 3.1.