master-bc-2705

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