DEV-20505 part 2