master-bc-1078

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