LPS-38243

Nate, Julio says he wants this in today. https://issues.liferay.com/browse/LPS-38243