master-bc-871

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