DEV-10317 review 4