Merge from release/2014.12