master-bc-2563

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