master-bc-852

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