floorplan adjustments for commenters
Merge remote-tracking branch 'origin/Arian'