2014.1 Required Cherry-picks