Build 260513
------------

- Fixes to bring the marksurface-counts closer to original BJP results
- Changes to improve cross-platform compatibility