master-bc-2323

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