master-bc-2660

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