master-bc-2174

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