master-bc-2171

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