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 6776032cadadeb19f22721fc6cb4da3ab52c9cd7)

(cherry picked from commit 487fbcd76d11c5658719b3a3984653006a48b81f)