master-bc-2135

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