LPS-44581 + reviewer changes