Merge branch 'endpoints'