Consumer: richer experience
Template cleaning
Merge remote-tracking branch 'origin/master'