Fixing issue with .all flag appended causing no data to report
Merge remote-tracking branch 'origin/1.X' into 1.X