master-bc-796

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