Pull update-default-configs into release branch