Card #48 fix for testing the filter
Merge remote-tracking branch 'origin/develop' into develop