master-bc-2284

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