Merge pull request #3863 from lambdageek/dev-42584-take4