Hello Derek, Vera,
After checking a lot of SAP notes and posts, we sent a note to SAP explaining our issue. Actually, they are working on it. When we have a final solution from them, I will share it with you.
Please Derek, when you can, tell us the result of your retest.
Thanks,
Kind regards,
Manu