master-bc-2106

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