#661 - Removed Answer from filter.
Merge remote-tracking branch 'origin/t660' into t660