master-bc-2211

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