LPS-49496 Update to 1.7