Merge pull request #3786 from lambdageek/dev-42584-take2