master-bc-2861

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