LPS-38243

https://issues.liferay.com/browse/LPS-38243

Marc, is comments below. Send it back to me when you're done.

Byran