SOS-1528

This is the implementation for the plugin for LPS-34887. https://github.com/brianchandotcom/liferay-portal/pull/10723

Please let me know if you want us to back port this to 6.1