LPS-50557 SF

Nice PR @arturbr :+1: 

Thanks