Fix issue with CloudWatchLogs
Merge branch 'develop'