Merge branch 'main' into ci/mld-and-abs-diff