Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken * commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9': Adding the backward-compatible filtering heuristics for the new device
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken * commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9': Adding the backward-compatible filtering heuristics for the new device