master-bc-1032

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