This also got merged (without linking back to the bug) and is part of commit bc46889d6fadf86665ceb309301e71b58c48c438
This also got merged (without linking back to the bug) and is part of commit bc46889d6fadf86 665ceb309301e71 b58c48c438