+ bugfix and event raise for none-clustered environment