Update notes for submitted changes

* Wait till message handling is done on service stop