Merge branch 'fix/frontend-cli-docs' into 'develop'