master-bc-1040

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