Merge branch 'main' into basop-2292-remove-eig2x2_fx-optimisation