Add filtering support to increment/decrement
Merge branch 'add-increment-where'