master-qa-6337

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