[BallJoint/FreeJoint] Fix integration
Merge branch 'release-4.2'