master-bc-1872

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