master-qa-6210

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