We have some improvements in 28.x you can try it out. It's due for release today.