master-bc-2335

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