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