master-bc-2607

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