master-bc-2763

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