master-bc-2689

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