master-qa-5963

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