master-bc-2590

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