master-qa-6620

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