Merge from Pentaho