Fixed CAAERS-6490
Merge branch 'master' of github.com:NCIP/caaers