master-bc-2790

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