master-bc-1384

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