js royer

@martijnvankekem Hi, would you mind rebasing this to latest? Would love for this to get merged. We've had the same issue as you