DEV-23732 part 1