CS fixes
Adding upgrade notes