master-bc-848

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