master-bc-2167

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