LPS-36904 Do NOT merge