Updated DEV-17975, added DEV-40106