DEV debug correction
Merge branches 'hotfix/2.7-RC1' and 'hotfix/2.7-RC1' of https://github.com/NCIP/caaers into hotfix/2.7-RC1