master-bc-1313

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