master-bc-2734

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