master-bc-2316

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