Wallsmoothing 2.0 fixes.
Merge pull request #1816 from N3X15/fix-wallmerge

Wallsmoothing 2.0 fixes.