DEV-20231 part 3