master-qa-8181

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