master-bc-794

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