master-qa-8652

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