Is this the same issue as bug 1813954 / bug 1798187? (the latter has a signed off pullrequest, the former has been marked as a duplicate).
Is this the same issue as bug 1813954 / bug 1798187? (the latter has a signed off pullrequest, the former has been marked as a duplicate).