DEV-19808 part 6