master-bc-2453

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