LPS-35234 initial commit