NEMO-1838 We use drop!, not drop
NEMO-1838 WIP