master-qa-8271

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