@(rekado|lle-bout|danny), Could any of you please review and merge the attached patches to core-updates? These patches has been successfully built on bayfront, from which you can obtain substitutes, if needed. I will send some more patches for this #42958 by tomorrow. It would be great if we could together finish-off this #42958 ASAP, so that I can bring remaining patches from wip-deskop. P.S Please pardon two cosmetic changes patches, which were done very long ago and had to use it to cleanly apply succeeding patches. Also, I must have used #t with lambda out of habit. Regards, RG.