master-bc-2975

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