Merge branch 'hector'