LPS-33093 and LPS-33320

new commit, close the other one