CHANGE NOTIFICATION_WAIT_MODE to false
ROLLBACK commit a3e3488
FIX issues raised in code review