master-bc-3007

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