Exception handling during cluster drop was changed.
Merge remote-tracking branch 'origin/develop' into develop