DEV-20292 part 2