master-bc-810

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