master-bc-2597

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