Merge main into basop-2336-duplications-of-dot_product