master-bc-2692

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