master-bc-2907

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