Merge branch 'main' into 819-fix-masa2total-threshold-precision