master-qa-7835

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