master-qa-5989

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