Tilman Müller, I believe I have a fix for the problem but it requires a bit more testing of the various collection mapping scenarios as I want to make sure I have not missed an edge case for compatibility. I'll tentatively schedule this for 5.3.7.