Merge branch 'km/help-prompt-fix'