Merge pull request #2310 from lambdageek/dev/bug-36305