DEV-18634 part 2