master-qa-6290

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