Merge pull request #4796 from lambdageek/dev-handles-may04