master-qa-8307

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