some cleanup in mix_config_pg
Merge remote branch 'origin'