master-bc-1239

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