master-bc-1385

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