Updating to current baseline

Fixed settings