master-bc-2134

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