master-bc-2351

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