master-bc-3008

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