LPS-41955

Resending for convenience/so that we don't forget.