master-bc-2803

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