Merge from vendor branch GDB: