master-bc-2857

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