TMDM-7936: only the "Fire a Create / Update event" option is ticked will...

this modification should also be merged to branch 6.0