Merge branch 'main' into fix_1830_debug_mode