master-bc-2974

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