master-bc-1044

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