SOS-1528

This is the plugin part of the implementation for LPS-34887.