sync with context as of 2014-07-05