I'll try a build of the main line branch and let you know how it goes