master-qa-7870

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