master-bc-2152

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