merge joint 0.8.1 functionality