Merge commit '1ae50c1544e983ffc1' into trunk-doc4-fix