master-bc-2273

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