LPS-47663

Nice work @daledotshan