Merge branch 'master', remote-tracking branch 'origin'
movable furniture, red dispatch zones