Merge remote-tracking branch 'hoatle/improvements/8_proper_prod_settings' into develop