master-bc-1004

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