Merge branch 'nd/completion-no-cache-failure'