LPS-40917

There's an associated change to the plugin that I'll send after this one is merged