DEV-19545 part 2