Merge branch 'ci/commit--interactive-atomic'