LPS-44514 - temp commit