LPS-40604

https://issues.liferay.com/browse/LPS-40604