JBPM-4036 and JBPM-4038 adjustements