Small fix to make selection a bit more smoother when rules fail
Merge remote-tracking branch 'origin/master'