master-bc-2130

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