Fixes #2013, fixes event publishing after entry-process
cosmetics
Merge pull request #2035 from gurbuzali/entry-process-event/3.2-RC3

Entry process event/3.2 rc3