Resolving merge conflicts in the debugger branch. Bringing it up-to-date