Back end coded for manage endpoint
Merge branch 'master' into develop