DEV-10317 review 6