APERTEWORKFLOW-931
Merge remote-tracking branch 'remotes/bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1-JSP