Merge from 'graph' branch