master-qa-8270

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