master-bc-2334

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