master-qa-7316

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