master-bc-858

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