Sync changes until 2013.3.27