master-qa-6199

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