Merge from 'repositories' branch