master-bc-2723

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