Potential fix for GBT connection issue
Merge remote-tracking branch 'remotes/mumus/master'