Fixed selection of custom CSS class field
Merge branch '2.0'