master-bc-837

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