master-bc-800

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