master-bc-1308

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