SavePoint EventHandler removed
Merge branch 'master' into T-5073