master-bc-2326

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