master-bc-2545

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