master-bc-2686

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