master-bc-2657

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