Merge pull request #3731 from lambdageek/dev-handles-gbmc