Sorry for the delayed response to your post. I did some checking on this and found out that we have made some improvements in this area specifically that will be coming in 4.13. You should be able to see these improvements in one of the preview versions of 4.13.