LPS-32988

This is the first option