master-bc-1087

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