Merge "Update SettingUp section"