master-bc-1031

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