LPS-19107

Hi Sam, can you look at it? I believe this will work for 6.1.x too.