master-bc-2638

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