Updated cares flag processing
Merge branch 'master' into sm