master-qa-8721

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