Continuation of issue 9968 (revision 69081). This should be the last one.