Commiting config changes from dev5.priv.sf.