master-bc-1895

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