master-bc-2175

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