master-qa-9661

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