ported commit from fsuarez for lma kinematics to groovy-dev