fix template rendering issues because of lack of data
handle merge conflict.
Merge remote-tracking branch 'origin/feature/frontend' into develop
Fix default values to output doesn't complain
Merge branch 'feature/homepage' into develop
Merge branch 'develop' into feature/frontend