Not yet. I can provide a temp fix if necessary, but making this work in all combinations of things is quite a huge undertaking, probably in the next major release.