master-bc-1870

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