This looks like a dup of [c8c0b78c84]
proposed fix committed to branch "ticket-c8c0b78c84"