Fixed issue #7731: When "Showing filtered results" if you change number of records or any other data the filter is lost
Merge remote-tracking branch 'origin/master'