Replication filters not possible on 5.7?

After upgrading from 5.6 to 5.7. We found an issue in part of our replication tree that is using various replicate-do-* options. Slave replication had failed on these hosts citing issue with XA transactions for tables that were excluded by the replicate-do-* options:

Last_SQL_Errno: 1399
Last_SQL_Error: Error in Xid_log_event: Commit could not be completed, 'XAER_RMFAIL: The command cannot be executed when global transaction is in the NON-EXISTING state'

It was not possible to skip these errors using slave-skip-errors = 1399 or indeed ALL.

Given that its not possible to disable XA transactions since 5.7-7 what options are there for not replicating certain tables?

We have a similar problem, we are migrating from mysql 5.6 to 5.7.

Configuration:
M1: Master database Mysql 5.6.30 (all databases are replicated to de slave database S1)
S1: Slave database Mysql 5.7.12 (1 new database created on this machine, all databases except the new one are replicated to the second slave database S2)
S2: Second slave database Mysql 5.7.12

The error occurred on the second slave database (S2).
Error in log-file on S2:

[ERROR] Slave SQL for channel ‘’: Error in Xid_log_event: Commit could not be completed, ‘XAER_RMFAIL: The command cannot be executed when global transaction is in the NON-EXISTING state’, Error_code: 1399
[Warning] Slave: XAER_RMFAIL: The command cannot be executed when global transaction is in the NON-EXISTING state Error_code: 1399
[ERROR] Error running query, slave SQL thread aborted. Fix the problem, and restart the slave SQL thread with “SLAVE START”. We stopped at log ‘mysql05_binlog.000094’ position 461004300

No errors are mentioned on the other 2 databases.

Any ideas how to fix it?

I have not found a solution yet. We had to make changes to our infrastructure which was really unexpected and annoying. In fact we lost some of our redundancy due to this issue.