HIPPOTHEME-26: Backport Hippo Theme Demo improvements from 7.10