At this point, the two merges proposed by renato workaround both issues; a longer term fix will at some point be needed, with potential changes in the core apps as well.
At this point, the two merges proposed by renato workaround both issues; a longer term fix will at some point be needed, with potential changes in the core apps as well.