Endpoint fix
Merge branch 'blueprint-fix' into dist