BACKLOG-3945: Handle lazy properties removal and presence