Hi, I think these deserve to be added to the 18.2.x branch: 44f1dcf9b3fd902fbb36a939b45469ed9f9264e6 886a048febcea2cd6e0e2cdaa2522bbf2b0f48ab e8c42ed4abaca798ab218ede97eaac30fbb8bd8e 24db1c7fcc43fb433af6bfe80af934c3775387f1 5bd836968172151d633675a5f9b4f8b646971a31 thanks! -- t