Merge "Enable debugging of RS code under GDB"