master-bc-3024

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