merge upstream LT 0.5.19