Merge pull request #4730 from lambdageek/facades-and-bug-580