master-bc-2778

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