master-bc-2185

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