master-qa-6335

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