master-bc-2428

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