master-qa-5912

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