LPS-45272

Hey Brian,

as you requested I am resending this pull after I resolved the rebase conflicts.

thanks,
Daniel