LPS-39399

LPS-39399 second part. cc @jorgeferrer