master-qa-6060

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