master-bc-874

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