master-bc-814

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