DEV-10100 needed review