master-bc-806

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