master-bc-801

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