Merge "Improve BSP toString" into main