master-bc-2668

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