Created attachment 6509 [details] Patch for v3-6-test After the idmap changes under the hood, this is low hanging fruit that I actually only forgot to add. Attached find a patch that takes the patches from master to v3-6-test.
Assigning to Karolin for inclusion in 3.6.0. (Ambi: when you give a positive review, please assign the but to Karolin)
Pushed. Closing out bug report. Thanks!