master-bc-2376

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