LPS-39399

This is the second part of LPS-39399. It goes on top of the first one.

cc @jorgeferrer