LPS-31936

Hey Shin. I was unable to rebase. I'll attached the log in the next comment.