master-bc-2296

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