Merge branch 'hotfix/2.1.7'
Rename debug_path as debug_endpoint.
Merge branch 'hotfix/2.1.8' into develop