master-bc-3040

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