[Boost148] Integrated Radu Greab's path to fix the debug-related issue.