master-bc-851

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