CAAERS-7024 fix illegal address
Merge branch 'develop' of https://github.com/NCIP/caaers into develop