Fix for possible EmptyStackException
ACT-1904: introduce ProcessEngineConfigurator
Merge remote-tracking branch 'upstream/master'