master-bc-1351

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