merged sochi update