master-bc-2738

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