Manual merge of PR #2566
Manual merge of PR #2566

flowable/flowable-engine,flowable/flowable-engine,dbmalkovsky/flowable-engine,dbmalkovsky/flowable-engine,dbmalkovsky/flowable-engine,flowable/flowable-engine,flowable/flowable-engine,dbmalkovsky/flowable-engine