master-bc-2713

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