master-bc-1786

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