master-bc-2698

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