Merge branch 'main' into fix-879-diff-conceal-path