#8725-R: fix build warnings