CAAERS-6960 - compound action minor logic corrections
Merge branch 'master' of https://github.com/NCIP/caaers