Merge branch 'bug_621_caid_info'