Fixes check for breaking walls
Merge remote branch 'origin' into general-devel