Shouldn't be too much work, just need to port this commit: https://github.com/OpenFusionProject/OpenFusionClient/commit/01ee292d10517edba7299af9d81e7b83e03ab5c7
Shouldn't be too much work, just need to port this commit: OpenFusionProject/OpenFusionClient@01ee292