master-qa-8152

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