2 more cases from Cloudwatch
Merge pull request #1373 from xschildw/PLFM-2784-3

2 more cases from Cloudwatch