Merging the debugger branch with the latest main branches