Fix prod config.
Merge branch 'develop' into feature/181_new_startpage