master-bc-2928

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