Merge "BUG-1845: implement proper shutdown sequence"