Merge "Fix rld-debug2 socket issue"