master-bc-2349

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