Fixed CAAERS-6554, CAAERS-6553.
Merge branch 'master' of github.com:NCIP/caaers