fix issue where filters isValid returns no data present error when data set on aggregate filter
fixes #5270
fixes #5270
fixes #5270 - rebased to master
Merge remote-tracking branch 'upstream/master'
Merge branch 'hotfix/5220'

Close #5220
Merge pull request #5271 from steverhoades/master

fixes #5270
[#5271] CS fixes

- trailing whitespace
- add parameter annotation
- typehint on new parameter
- spaces after operators, comments
- remove extraneous lines in test
Merge branch 'hotfix/5271' into develop

Forward port #5271