LPS-40926

Reviewed by Alex already. This is categorized as priority 4. Not sure if it needs to make the RC.