Merge from 'hadoop' branch