LPS-50507

Its been a long time. I hope I did JIRA correctly.