Merge "Fix attaching to debugger for 3.5.1"