master-bc-2272

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