LPS-34483

This one has a plugins part...