sync with Context as of 2013-05-23