Merge from 'apache' branch