Merge branch 'feature/config'
Merge branch 'fix/tear-down-the-Wall'