Companion for #6503 (#1315)

* Companion for #6503

* Remove old filtering

* Bump tx version

* Bump version

* Bump
8 jobs for master in 26 minutes and 27 seconds (queued for 1 second)