master-bc-3042

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