2014.1 Cherry-picks