Fixed the issue with CAAERS-6492.
Merge branch 'master' of github.com:NCIP/caaers