master-qa-8129

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