CFY-1272 fixing context updates