DEV-20713 part 2