master-bc-811

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