Merge branch 'delegator'