Run filtered row count query only if a filter argument is provided
Rewrite to minimize no. of lines
Rewrite to minimize no. of lines
Rewrite to minimize no. of lines
Merge branch '4.2'