Fixed: Click on switch in floorplan didn't work
Merge branch 'beta'