Previously, class was not output unless item was in a form

(cherry picked from commit 48eeb5f3317a39fac1e821305e1e76975bccb5ca)

(cherry picked from commit a9069d3ad39c0658bff72c763aa1e5520663726f)

(cherry picked from commit 3528f073595e2097de3b3acf0a2c40bd17bc485a)

(cherry picked from commit 487fbcd76d11c5658719b3a3984653006a48b81f)

(cherry picked from commit 3620bdf0c1521d001901de3fec8027ff5d053e3a)

(cherry picked from commit 6517f235650e374a195cae6d7b98050089f9464f)

(cherry picked from commit 028d09e986707dac96d70f8f64259e70aa9c8614)

(cherry picked from commit 8db86bc9d87f21efc9990a9a5a7c8101e12f5da7)