master-bc-2487

https://issues.liferay.com/browse/LIFERAYQA-10988