R2 related Floor changes are done
Merge branch 'R2_Floors'