sync with Context as of 2014-12-29