master-bc-2647

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