Merge pull request #2106 from lambdageek/dev/bug-29108-part1