master-bc-1048

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