master-bc-1012

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