Resolution was rejected. We have agreed that this should be resolved on the TCK level.
I have created CDITCK-520 to track it there instead.