Simplifying code by Christian
Merge remote-tracking branch 'origin/jl_productsHeader' into jl_productsHeader