master-bc-809

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