master-bc-2140

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