master-qa-6190

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