Amend class on body to allow condition for category or tax
Merge remote-tracking branch 'origin/develop' into develop