master-bc-2617

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