master-bc-2484

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