LPS-47551

Sampsa could you have a look at this if it's OK.