master-bc-1438

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