Merge pull request #4935 from lambdageek/dev-handles-may