master-qa-6417

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