add fluid layout setting
Merging the fluid layout

Merge branch '2.1.1' into 2.3.2