master-bc-2704

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