master-bc-3213

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