sync with Context as of 2014-07-06