LPS-43947

This should be the last try :smile_cat: