master-bc-2523

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