Merge branch 'ik3-testing-fixes' into ik-next