master-qa-8045

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