LPS-36216 Last Part

Hey Brian,

This is the last part. Please resolve the task when you're finished with this.

Thanks,
Zsolt.