Fix default values to output doesn't complain
Merge branch 'feature/homepage' into develop