#8725-R: redo commit '1088c47' for test