#8725-R: minor changes