master-bc-2618

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